feat(trezor): add account info, compose, and broadcast FFI exports by coreyphillips · Pull Request #75 · synonymdev/bitkit-core

coreyphillips · 2026-03-05T14:04:31Z

This PR:

Adds account_info module with BDK/Electrum queries (no device required)
Adds compose module bridging bitkit-core account types to trezor-connect-rs offline coin selection
Adds fetch_prev_txs to retrieve previous transactions needed for non-SegWit signing
Adds broadcast_raw_tx to broadcast signed transactions via Electrum
Adds AccountInfoError error type for blockchain query operations
Adds reverse ScriptType conversion and compose FFI types
(TrezorFeeLevel, TrezorSortingStrategy, TrezorPrecomposeOutput,
TrezorPrecomposeParams, TrezorPrecomposedInput, TrezorPrecomposedOutput,
TrezorPrecomposedResult)

New FFI exports

Function	Description
`trezor_get_account_info`	Queries account data from xpub via Electrum
`trezor_get_address_info`	Queries balance/UTXOs for a single address
`trezor_account_type_to_script_type`	Maps account type to script type
`trezor_precompose_transaction`	Performs offline coin selection and fee calculation
`trezor_precomposed_to_sign_params`	Converts compose results to signing parameters
`trezor_fetch_prev_txs`	Fetches previous transactions from Electrum
`trezor_broadcast_raw_tx`	Broadcasts signed transaction via Electrum

…ports

# Conflicts: # Cargo.lock # Cargo.toml # Package.swift # bindings/android/gradle.properties # bindings/android/lib/src/main/jniLibs/arm64-v8a/libbitkitcore.so # bindings/android/lib/src/main/jniLibs/armeabi-v7a/libbitkitcore.so # bindings/android/lib/src/main/jniLibs/x86/libbitkitcore.so # bindings/android/lib/src/main/jniLibs/x86_64/libbitkitcore.so # bindings/android/lib/src/main/kotlin/com/synonym/bitkitcore/bitkitcore.android.kt # bindings/ios/BitkitCore.xcframework.zip # bindings/ios/BitkitCore.xcframework/ios-arm64-simulator/libbitkitcore.a # bindings/ios/BitkitCore.xcframework/ios-arm64/libbitkitcore.a # bindings/python/bitkitcore/libbitkitcore.dylib

src/modules/onchain/implementation.rs

ben-kaufman · 2026-03-11T06:21:06Z

I've went over parts of the code, but have a few bigger and a bit more general points I'd like to understand/ address first:

get_account_info opens two Electrum connections and makes ~50 redundant script_get_history calls that duplicate what BDK already did during wallet.sync(). Derive used/unused from the LastUnused boundary instead — eliminates the second connection entirely.
xpub/tpub → Legacy is incorrect. Plain xpub/tpub is generic BIP32, not inherently BIP44. Many wallets export native segwit accounts as xpub. This will build wrong descriptors for those keys. Consider requiring a script_type parameter when the prefix is ambiguous.
Coin selection is split across two engines. LDK sends use BDK coin selection (via LDK Node), with user-configurable algorithms (Branch & Bound, Largest First, etc.). Trezor sends use trezor_connect_rs's own compose engine, which ignores the user's coin selection preference. Consider using BDK's TxBuilder for Trezor compose too and converting the PSBT to TrezorSignTxParams — this would unify coin selection and let the user's algorithm choice apply to both flows.
No transaction history. get_account_info returns UTXOs and addresses but no transaction list. Both apps build their activity UI from LDK events → activity DB. Without a get_transaction_history function, there's no way to populate the activity screen for a watch-only account.
No event/change detection. LDK emits real-time events (onchainTransactionReceived, Confirmed, Replaced, etc.). For watch-only there's no equivalent — the app has no way to know when new transactions arrive or confirm.

…pt-based lookups, and coinbase detection - Reuse single Electrum client for block height and wallet sync - Replace sequential script_get_history calls with BDK LastUnused boundary - Use HashMap<ScriptBuf, String> for direct UTXO path lookups - Add proper coinbase detection via is_coin_base() - Add script_type override for ambiguous xpub/tpub prefixes

coreyphillips · 2026-03-11T13:55:38Z

Regarding the items above:

This was addressed in this commit. Moved block_headers_subscribe before ElectrumBlockchain::from() so a single connection handles both block height and sync. Replaced all script_get_history calls with BDK's LastUnused boundary transfers now reports binary used/unused (1/0) since downstream only uses the split, not exact counts. This eliminates the second connection and ~50 redundant Electrum calls entirely.
This was addressed in this commit. Added script_type: Option<AccountType> parameter to get_account_info where the caller can explicitly specify the account type. If no script_type is provided, behavior falls back to the existing prefix detection.
Merging coinselection engines or having trezor-connect-rs conform to BDK's coin-selection presets is out of scope for this PR. While the compose engine does run its own coin selection (BnB with Accumulative fallback) the caller controls which UTXOs are passed. If the user wants to use specific UTXOs, they simply pass only those UTXOs and the compose engine selects from whatever it's given. There's also a required: Option<bool> flag on each AccountUtxo that forces inclusion regardless of confirmation filtering. So while the algorithms differ from BDK's, the user isn't locked out of UTXO control if they pre-filter on the app side before calling compose.
Getting transactions would also be a separate PR. This PR focuses on setting up what's needed to compose/sign transactions.
Event/change detection would also be a separate PR. This PR focuses on setting up what's needed to compose/sign transactions.

ovitrif

LGT-M&CC™

Claude had 3 suggestions but no blocker (ie. no issue with confidence score +80%).

So I asked it to add them as pending comments and it didn't disappoint 😎

src/modules/trezor/compose.rs

src/modules/trezor/types.rs

src/modules/onchain/implementation.rs

…ped coin enum - Replace unwrap_or(0) with proper error propagation for amount parsing in precomposed_to_sign_params to prevent silent 0-value outputs - Change TrezorPrecomposeParams.coin from String to Option<TrezorCoinType> to eliminate invalid coin name bugs - Activate network validation in get_address_info to catch address/network mismatches

- Updates bindings - Bumps version to 0.1.46

- Updates bindings - Bumps version to 0.1.47

ben-kaufman · 2026-03-12T02:09:05Z

Ok thanks. About 3, maybe we should at least leave a TODO comment to make sure we update to use BDK and the coin selection algo of the user's choice?

…BT composition

ben-kaufman · 2026-03-12T08:17:31Z

So I tried looking into it a bit more, but still I don't understand why use the Trezor compose part?

I think it would be best to compose the transaction using BDK, which is very simple, will work for any hardware or watch only wallet (reducing Trezor specific code), and will allow preserving UTXO selection algorith. Then we just pass the BDK generated PSBT to the sign_tx_from_psbt for signing.
This would simplify the code, ensure better consistency with the app and LDK, and help better prepare for any future integration. Is there any reason that would require the Trezor compose over this?

ben-kaufman · 2026-03-12T08:19:10Z

I've made a vibe coded attempt to just use BDK over trezor compose, and code seems significantly shorter, usable for future integrations, and can support BDK coin selection algos. Can you see if this approach would make sense @coreyphillips ? Made it a draft here #78

coreyphillips · 2026-03-12T13:09:27Z

I've made a vibe coded attempt to just use BDK over trezor compose, and code seems significantly shorter, usable for future integrations, and can support BDK coin selection algos. Can you see if this approach would make sense @coreyphillips ? Made it a draft here #78

Nice! I think that would be a good approach. I'm just fixated on integrating trezor-connect-rs, but utilizing BDK for this in bitkit-core makes a lot of sense.

How would you like to proceed? Shall we review the draft and merge it in here once good?

ben-kaufman · 2026-03-12T13:32:34Z

Sure, I'll push some updates then so it's ready for review

…nd clean up types

BDK copose PSBT

ovitrif · 2026-03-16T22:55:40Z

@coreyphillips Bindings need to be regenerated?! (I'm pretty sure the answer is yes).

We should probably feel free to merge #76 and bump version higher than that one.

Version bump was the only reason I actually suggested merging that PR after this one.

EDIT: NVM, I just merged that PR so we can merge master in here, bump version and regenerate the bindings 🙏🏻

- Updates bindings - Bups version to 0.1.48

# Conflicts: # Cargo.lock # Cargo.toml # Package.swift # bindings/android/gradle.properties # bindings/android/lib/src/main/jniLibs/arm64-v8a/libbitkitcore.so # bindings/android/lib/src/main/jniLibs/armeabi-v7a/libbitkitcore.so # bindings/android/lib/src/main/jniLibs/x86/libbitkitcore.so # bindings/android/lib/src/main/jniLibs/x86_64/libbitkitcore.so # bindings/android/lib/src/main/kotlin/com/synonym/bitkitcore/bitkitcore.android.kt # bindings/android/lib/src/main/kotlin/com/synonym/bitkitcore/bitkitcore.common.kt # bindings/ios/BitkitCore.xcframework.zip # bindings/ios/BitkitCore.xcframework/ios-arm64-simulator/libbitkitcore.a # bindings/ios/BitkitCore.xcframework/ios-arm64/libbitkitcore.a # bindings/ios/bitkitcore.swift # bindings/python/bitkitcore/bitkitcore.py # bindings/python/bitkitcore/libbitkitcore.dylib # src/lib.rs

coreyphillips · 2026-03-17T00:04:14Z

Regenerating the bindings after merge now. Will ping you here once complete.

coreyphillips · 2026-03-17T00:23:55Z

@ovitrif, bindings have been updated and a new release created here.

ben-kaufman

lgtm as first step, will need to work on tx history and events later

feat(trezor): add compose transaction integration and account info ex…

34b3840

…ports

coreyphillips self-assigned this Mar 5, 2026

coreyphillips added the enhancement New feature or request label Mar 5, 2026

coreyphillips added 2 commits March 5, 2026 09:16

chore: update bindings

498584f

coreyphillips requested a review from ben-kaufman March 5, 2026 15:36

This comment was marked as resolved.

Sign in to view

coreyphillips requested a review from ovitrif March 5, 2026 18:36

chore: apply migration logic to activity module

8598bf3

This comment was marked as resolved.

Sign in to view

refactor: move generic methods from trezor to onchain module

cd4908d

This comment was marked as resolved.

Sign in to view

ben-kaufman reviewed Mar 11, 2026

View reviewed changes

src/modules/onchain/implementation.rs Outdated Show resolved Hide resolved

ben-kaufman reviewed Mar 11, 2026

View reviewed changes

src/modules/onchain/implementation.rs Show resolved Hide resolved

ben-kaufman reviewed Mar 11, 2026

View reviewed changes

src/modules/onchain/implementation.rs Outdated Show resolved Hide resolved

ben-kaufman reviewed Mar 11, 2026

View reviewed changes

src/modules/onchain/implementation.rs Outdated Show resolved Hide resolved

coreyphillips requested a review from ben-kaufman March 11, 2026 13:57

ovitrif reviewed Mar 11, 2026

View reviewed changes

src/modules/trezor/compose.rs Outdated Show resolved Hide resolved

src/modules/trezor/types.rs Outdated Show resolved Hide resolved

src/modules/onchain/implementation.rs Outdated Show resolved Hide resolved

ovitrif mentioned this pull request Mar 11, 2026

feat: Add Pubky profile and contacts fetching APIs (v0.1.46) #76

Merged

coreyphillips added 2 commits March 11, 2026 21:15

chore: update bindings

978bcac

- Updates bindings - Bumps version to 0.1.46

coreyphillips requested a review from ovitrif March 12, 2026 01:17

chore: update bindings

9e9178d

- Updates bindings - Bumps version to 0.1.47

refactor: replace Trezor-specific compose with signer-agnostic BDK PS…

911355e

…BT composition

ben-kaufman and others added 3 commits March 12, 2026 22:40

refactor(onchain): harden compose validation, fix error vec sizing, a…

f65b024

…nd clean up types

fixes

635797b

Merge pull request #78 from synonymdev/feature/bdk-compose

e98f6c3

BDK copose PSBT

coreyphillips added 3 commits March 16, 2026 19:50

fix(onchain): allow regtest network with testnet key prefixes

f9c755d

chore: update bindings

c09f7c9

- Updates bindings - Bups version to 0.1.48

chore: update bindings

8868d60

ben-kaufman approved these changes Mar 17, 2026

View reviewed changes

Conversation

coreyphillips commented Mar 5, 2026

New FFI exports

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ben-kaufman commented Mar 11, 2026

Uh oh!

coreyphillips commented Mar 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ovitrif left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ben-kaufman commented Mar 12, 2026

Uh oh!

ben-kaufman commented Mar 12, 2026

Uh oh!

ben-kaufman commented Mar 12, 2026

Uh oh!

coreyphillips commented Mar 12, 2026

Uh oh!

ben-kaufman commented Mar 12, 2026

Uh oh!

ovitrif commented Mar 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coreyphillips commented Mar 17, 2026

Uh oh!

coreyphillips commented Mar 17, 2026

Uh oh!

ben-kaufman left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

coreyphillips commented Mar 11, 2026 •

edited

Loading

ovitrif left a comment •

edited

Loading

ovitrif commented Mar 16, 2026 •

edited

Loading